diff --git a/datastore/.gcloudignore b/datastore/.gcloudignore
new file mode 100644
index 0000000..603f0b6
--- /dev/null
+++ b/datastore/.gcloudignore
@@ -0,0 +1,19 @@
+# This file specifies files that are *not* uploaded to Google Cloud
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# Python pycache:
+__pycache__/
+# Ignored by the build system
+/setup.cfg
\ No newline at end of file
diff --git a/datastore/app.yaml b/datastore/app.yaml
new file mode 100644
index 0000000..176d4a9
--- /dev/null
+++ b/datastore/app.yaml
@@ -0,0 +1,6 @@
+runtime: python39
+handlers:
+- url: /static
+  static_dir: static
+- url: /.*
+  script: auto
diff --git a/datastore/index.yaml b/datastore/index.yaml
new file mode 100644
index 0000000..eeb0f77
--- /dev/null
+++ b/datastore/index.yaml
@@ -0,0 +1,20 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+indexes:
+- kind: visit
+  ancestor: yes
+  properties:
+  - name: timestamp
+    direction: desc
\ No newline at end of file
diff --git a/datastore/main.py b/datastore/main.py
new file mode 100644
index 0000000..67a277b
--- /dev/null
+++ b/datastore/main.py
@@ -0,0 +1,93 @@
+import datetime
+
+from flask import Flask, render_template, request
+from google.auth.transport import requests
+from google.cloud import datastore
+import google.oauth2.id_token
+
+firebase_request_adapter = requests.Request()
+# [START gae_python38_datastore_store_and_fetch_user_times]
+# [START gae_python3_datastore_store_and_fetch_user_times]
+
+datastore_client = datastore.Client()
+# [END gae_python3_datastore_store_and_fetch_user_times]
+# [END gae_python38_datastore_store_and_fetch_user_times]
+app = Flask(__name__)
+
+
+# [START gae_python38_datastore_store_and_fetch_user_times]
+# [START gae_python3_datastore_store_and_fetch_user_times]
+def store_time(email, dt):
+    entity = datastore.Entity(key=datastore_client.key('User', email, 'visit'))
+    entity.update({
+        'timestamp': dt
+    })
+
+    datastore_client.put(entity)
+
+
+def fetch_times(email, limit):
+    ancestor = datastore_client.key('User', email)
+    query = datastore_client.query(kind='visit', ancestor=ancestor)
+    query.order = ['-timestamp']
+
+    times = query.fetch(limit=limit)
+
+    return times
+
+
+@app.route('/')
+def root():
+    # Verify Firebase auth.
+    id_token = request.cookies.get("token")
+    error_message = None
+    claims = None
+    times = None
+
+    if id_token:
+        try:
+            # Verify the token against the Firebase Auth API. This example
+            claims = google.oauth2.id_token.verify_firebase_token(
+                id_token, firebase_request_adapter)
+
+            store_time(claims['email'], datetime.datetime.now())
+            times = fetch_times(claims['email'], 10)
+
+        except ValueError as exc:
+            # verification checks fail.
+            error_message = str(exc)
+
+    return render_template(
+        'index.html',
+        user_data=claims, error_message=error_message, times=times)
+
+@app.route('/uploadfile')
+def uploadfile():
+    # Verify Firebase auth.
+    id_token = request.cookies.get("token")
+    error_message = None
+    claims = None
+    times = None
+
+    if id_token:
+        try:
+            # Verify the token against the Firebase Auth
+            claims = google.oauth2.id_token.verify_firebase_token(
+                id_token, firebase_request_adapter)
+
+            store_time(claims['email'], datetime.datetime.now())
+            times = fetch_times(claims['email'], 10)
+
+        except ValueError as exc:
+            # verification checks fail.
+            error_message = str(exc)
+
+    return render_template(
+        'uploadfile.html',
+        user_data=claims, error_message=error_message, times=times)
+
+ 
+
+if __name__ == '__main__':
+    # This is used when running locally only.
+    app.run(host='127.0.0.1', port=8080, debug=True)
\ No newline at end of file
diff --git a/datastore/requirements.txt b/datastore/requirements.txt
new file mode 100644
index 0000000..60655c4
--- /dev/null
+++ b/datastore/requirements.txt
@@ -0,0 +1,4 @@
+Flask==2.0.1
+google-cloud-datastore==2.1.6
+google-auth==1.31.0
+requests==2.26.0
\ No newline at end of file
diff --git a/datastore/static/script.js b/datastore/static/script.js
new file mode 100644
index 0000000..b9ecdb4
--- /dev/null
+++ b/datastore/static/script.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2018, Google LLC
+ * Licensed under the Apache License, Version 2.0 (the `License`);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an `AS IS` BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// [START gae_python38_log]
+'use strict';
+window.addEventListener('load', function () {
+ document.getElementById('sign-out').onclick = function () {
+ firebase.auth().signOut();
+ };
+ // FirebaseUI config.
+ var uiConfig = {
+ signInSuccessUrl: '/',
+ signInOptions: [
+ // Comment out any lines corresponding to providers you did not check in
+ // the Firebase console.
+ firebase.auth.GoogleAuthProvider.PROVIDER_ID,
+ firebase.auth.EmailAuthProvider.PROVIDER_ID,
+ //firebase.auth.FacebookAuthProvider.PROVIDER_ID,
+ //firebase.auth.TwitterAuthProvider.PROVIDER_ID,
+ //firebase.auth.GithubAuthProvider.PROVIDER_ID,
+ //firebase.auth.PhoneAuthProvider.PROVIDER_ID
+ ],
+ // Terms of service url.
+ tosUrl: '<your-tos-url>'
+ };
+ firebase.auth().onAuthStateChanged(function (user) {
+ if (user) {
+ // User is signed in, so display the "sign out" button and login info.
+ document.getElementById('sign-out').hidden = false;
+ document.getElementById('login-info').hidden = false;
+ console.log(`Signed in as ${user.displayName} (${user.email})`);
+ user.getIdToken().then(function (token) {
+ // Add the token to the browser's cookies. The server will then be
+ // able to verify the token against the API.
+ // SECURITY NOTE: As cookies can easily be modified, only put the
+ // token (which is verified server-side) in a cookie; do not add other
+ // user information.
+ document.cookie = "token=" + token;
+ });
+ } else {
+ // User is signed out.
+ // Initialize the FirebaseUI Widget using Firebase.
+ var ui = new firebaseui.auth.AuthUI(firebase.auth());
+ // Show the Firebase login button.
+ ui.start('#firebaseui-auth-container', uiConfig);
+ // Update the login state indicators.
+ document.getElementById('sign-out').hidden = true;
+ document.getElementById('login-info').hidden = true;
+ // Clear the token cookie.
+ document.cookie = "token=";
+ }
+ }, function (error) {
+ console.log(error);
+ alert('Unable to log in: ' + error)
+ });
+});
\ No newline at end of file
diff --git a/datastore/static/style.css b/datastore/static/style.css
new file mode 100644
index 0000000..6473bef
--- /dev/null
+++ b/datastore/static/style.css
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ body {
+    font-family: "helvetica", sans-serif;
+    text-align: center;
+ }
\ No newline at end of file
diff --git a/datastore/static/upload.js b/datastore/static/upload.js
new file mode 100644
index 0000000..fccae3e
--- /dev/null
+++ b/datastore/static/upload.js
@@ -0,0 +1,34 @@
+// connect to appropriate page elements via the DOM
+var uploader = document.getElementById('uploader');
+var fileButton =  document.getElementById('fileButton');
+// add an event listener to the 
+fileButton.addEventListener('change', function(e){
+    var file = e.target.files[0];
+    // Create file metadata including the content type
+    var metadata = {
+        customMetadata: {
+            userid: '1',
+            activity: 'Course Work',
+            notes: 'A fixed message about this file'
+        }
+    };
+    // set  upload locaation
+    var storageRef = firebase.storage().ref('img/'+file.name);
+    //upload file and metadata
+    var task = storageRef.put(file, metadata);
+    // set callback event + function, error function and complete function
+    task.on('state_changed', function progress(snapshot) {
+    var percentage = (snapshot.bytesTransferred/snapshot.totalBytes)*100;
+    uploader.value = percentage;
+   
+  }, function error(err) {
+    alert("File upload failed:" + err.message);
+
+  },function complete() {
+    alert("File upload successful");
+    // For instance, get the download URL: https://firebasestorage.googleapis.com/...
+        task.snapshot.ref.getDownloadURL().then(function(downloadURL) {
+        console.log('File available at', downloadURL);
+    });
+  });
+});
\ No newline at end of file
diff --git a/datastore/templates/index.html b/datastore/templates/index.html
new file mode 100644
index 0000000..eed1879
--- /dev/null
+++ b/datastore/templates/index.html
@@ -0,0 +1,94 @@
+<!doctype html>
+<!--
+ Copyright 2021 Google LLC
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<html>
+<head>
+  <title>Datastore and Firebase Auth Example</title>
+
+  <!-- See https://github.com/firebase/firebaseui-web. -->
+  <!-- [START gae_python38_auth_init_firebase] -->
+  <!-- [START gae_python3_auth_init_firebase] -->
+  <!-- *******************************************************************************************
+       * TODO(DEVELOPER): Paste the initialization snippet from:
+       * http://console.firebase.google.com > Overview > Add Firebase to your web app.
+       ***************************************************************************************** -->
+  <!-- [END gae_python3_auth_init_firebase] -->
+  <!-- [END gae_python38_auth_init_firebase] -->
+ 
+  <!-- [START gae_python38_auth_include_firebaseui] -->
+  <!-- [START gae_python3_auth_include_firebaseui] -->
+  <script src="https://www.gstatic.com/firebasejs/ui/4.5.0/firebase-ui-auth.js"></script>
+  <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/4.5.0/firebase-ui-auth.css">
+  <!-- [END gae_python3_auth_include_firebaseui] -->
+  <!-- [END gae_python38_auth_include_firebaseui] -->
+  <script src="{{ url_for('static', filename='script.js') }}"></script>
+  <link type="text/css" rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
+
+</head>
+<body>
+
+<h1>Datastore and Firebase Auth Example</h1>
+
+<!-- [START gae_python38_auth_firebase_html] -->
+<!-- [START gae_python3_auth_firebase_html] -->
+<div id="firebaseui-auth-container"></div>
+
+<button id="sign-out" hidden=true>Sign Out</button>
+
+<div id="login-info" hidden=true>
+  <h2>Login info:</h2>
+  {% if user_data %}
+    <dl>
+      <dt>Name</dt><dd>{{ user_data['name'] }}</dd>
+      <dt>Email</dt><dd>{{ user_data['email'] }}</dd>
+      <dt>Last 10 visits</dt><dd>
+	{% for time in times %}
+          <p>{{ time['timestamp'] }}</p>
+        {% endfor %} </dd>
+    </dl>
+  {% elif error_message %}
+    <p>Error: {{ error_message }}</p>
+  {% endif %}
+</div>
+<!-- [END gae_python3_auth_firebase_html] -->
+<!-- [END gae_python38_auth_firebase_html] -->
+</body>
+<!-- The core Firebase JS SDK is always required and must be listed first -->
+<script src="https://www.gstatic.com/firebasejs/8.9.0/firebase-app.js"></script>
+
+<script src="https://www.gstatic.com/firebasejs/8.9.0/firebase-auth.js"></script>
+
+<!-- TODO: Add SDKs for Firebase products that you want to use
+     https://firebase.google.com/docs/web/setup#available-libraries -->
+<script src="https://www.gstatic.com/firebasejs/8.9.0/firebase-analytics.js"></script>
+
+<script>
+  // Your web app's Firebase configuration
+  // For Firebase JS SDK v7.20.0 and later, measurementId is optional
+ var firebaseConfig = {
+    apiKey: "AIzaSyBgVLptO71EgUsSNy3POG2vAT_chDkxzuk",
+        authDomain: "ad-assignment-335217.firebaseapp.com",
+        projectId: "ad-assignment-335217",
+        storageBucket: "ad-assignment-335217.appspot.com",
+        messagingSenderId: "90196863214",
+        appId: "1:90196863214:web:17eb70962a9f8cf5392bff",
+        measurementId: "G-T1BG5KWP2S"
+};
+  // Initialize Firebase
+  firebase.initializeApp(firebaseConfig);
+  firebase.analytics();
+</script>
+
+
+</html>
\ No newline at end of file
diff --git a/sqlconnection/.gcloudignore b/sqlconnection/.gcloudignore
new file mode 100644
index 0000000..603f0b6
--- /dev/null
+++ b/sqlconnection/.gcloudignore
@@ -0,0 +1,19 @@
+# This file specifies files that are *not* uploaded to Google Cloud
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# Python pycache:
+__pycache__/
+# Ignored by the build system
+/setup.cfg
\ No newline at end of file
diff --git a/sqlconnection/app.yaml b/sqlconnection/app.yaml
new file mode 100644
index 0000000..5b60f90
--- /dev/null
+++ b/sqlconnection/app.yaml
@@ -0,0 +1,9 @@
+# [START gae_python37_cloudsql_config]
+runtime: python37
+
+env_variables:
+  CLOUD_SQL_USERNAME: gabby
+  CLOUD_SQL_PASSWORD: 4321
+  CLOUD_SQL_DATABASE_NAME: welcome
+  CLOUD_SQL_CONNECTION_NAME: ad-assignment-335217:europe-west2:ad-assignment
+# [END gae_python37_cloudsql_config]
\ No newline at end of file
diff --git a/sqlconnection/main.py b/sqlconnection/main.py
new file mode 100644
index 0000000..8b8659c
--- /dev/null
+++ b/sqlconnection/main.py
@@ -0,0 +1,44 @@
+# [START gae_python37_cloudsql_mysql]
+import os
+
+from flask import Flask
+import pymysql
+
+db_user = os.environ.get('CLOUD_SQL_USERNAME')
+db_password = os.environ.get('CLOUD_SQL_PASSWORD')
+db_name = os.environ.get('CLOUD_SQL_DATABASE_NAME')
+db_connection_name = os.environ.get('CLOUD_SQL_CONNECTION_NAME')
+
+app = Flask(__name__)
+
+
+@app.route('/')
+def main():
+    # When deployed to App Engine, the `GAE_ENV` environment variable will be
+    # set to `standard`
+    if os.environ.get('GAE_ENV') == 'standard':
+        # If deployed, use the local socket interface for accessing Cloud SQL
+        unix_socket = '/cloudsql/{}'.format(db_connection_name)
+        cnx = pymysql.connect(user=db_user, password=db_password,
+                              unix_socket=unix_socket, db=db_name)
+    else:
+        # If running locally, use the TCP connections instead
+        # Set up Cloud SQL Proxy (cloud.google.com/sql/docs/mysql/sql-proxy)
+        # so that your application can use 127.0.0.1:3306 to connect to your
+        # Cloud SQL instance
+        host = '127.0.0.1'
+        cnx = pymysql.connect(user=db_user, password=db_password,
+                              host=host, db=db_name)
+
+    with cnx.cursor() as cursor:
+        cursor.execute('select welcome_txt from welcome_tbl;')
+        result = cursor.fetchall()
+        current_msg = result[0][0]
+    cnx.close()
+
+    return str(current_msg)
+# [END gae_python37_cloudsql_mysql]
+
+
+if __name__ == '__main__':
+    app.run(host='127.0.0.1', port=8080, debug=True)
diff --git a/sqlconnection/requirements.txt b/sqlconnection/requirements.txt
new file mode 100644
index 0000000..f423bc5
--- /dev/null
+++ b/sqlconnection/requirements.txt
@@ -0,0 +1,5 @@
+Flask==2.0.1
+psycopg2==2.8.3
+psycopg2-binary==2.8.3
+PyMySQL==0.9.3
+SQLAlchemy==1.3.8
\ No newline at end of file
diff --git a/sqlremote/.gcloudignore b/sqlremote/.gcloudignore
new file mode 100644
index 0000000..603f0b6
--- /dev/null
+++ b/sqlremote/.gcloudignore
@@ -0,0 +1,19 @@
+# This file specifies files that are *not* uploaded to Google Cloud
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# Python pycache:
+__pycache__/
+# Ignored by the build system
+/setup.cfg
\ No newline at end of file
diff --git a/sqlremote/app.yaml b/sqlremote/app.yaml
new file mode 100644
index 0000000..5ad7ff5
--- /dev/null
+++ b/sqlremote/app.yaml
@@ -0,0 +1,7 @@
+runtime: python37
+
+env_variables:
+  CLOUD_SQL_USERNAME: gabby
+  CLOUD_SQL_PASSWORD: 4321
+  CLOUD_SQL_DATABASE_NAME: users
+  CLOUD_SQL_CONNECTION_NAME: ad-assignment-335217:europe-west2:ad-assignment
\ No newline at end of file
diff --git a/sqlremote/db.py b/sqlremote/db.py
new file mode 100644
index 0000000..2899d84
--- /dev/null
+++ b/sqlremote/db.py
@@ -0,0 +1,42 @@
+# db.py
+import os
+import pymysql
+from flask import jsonify
+
+db_user = os.environ.get('CLOUD_SQL_USERNAME')
+db_password = os.environ.get('CLOUD_SQL_PASSWORD')
+db_name = os.environ.get('CLOUD_SQL_DATABASE_NAME')
+db_connection_name = os.environ.get('CLOUD_SQL_CONNECTION_NAME')
+
+def open_connection():
+    unix_socket = '/cloudsql/{}'.format(db_connection_name)
+    try:
+        if os.environ.get('GAE_ENV') == 'standard':
+            conn = pymysql.connect(user=db_user,
+            password=db_password,
+            unix_socket=unix_socket,
+            db=db_name,
+            cursorclass=pymysql.cursors.DictCursor
+            )
+    except pymysql.MySQLError as e:
+        return e
+    return conn
+
+def get():
+    conn = open_connection()
+    with conn.cursor() as cursor:
+        result = cursor.execute('SELECT * FROM users;')
+        users = cursor.fetchall()
+        if result > 0:
+            got_users = jsonify(users)
+        else:
+            got_users = 'No users in DB'
+        return got_users
+
+def create(user):
+    conn = open_connection()
+    with conn.cursor() as cursor:
+        cursor.execute('INSERT INTO users (id, name, email) VALUES(%s, %s, %s)',
+    (user["1"], user["john"], user["john@email.com"]))
+    conn.commit()
+    conn.close()
\ No newline at end of file
diff --git a/sqlremote/main.py b/sqlremote/main.py
new file mode 100644
index 0000000..12e83a1
--- /dev/null
+++ b/sqlremote/main.py
@@ -0,0 +1,18 @@
+from flask import Flask, jsonify, request
+from db import get, create
+
+app = Flask(__name__)
+
+@app.route('/', methods=['GET'])
+def get_users():
+    return get()
+
+@app.route('/add', methods=['POST'])
+def add_user():
+    if not request.is_json:
+        return jsonify({"msg": "Missing JSON in request"}), 400
+    create(request.get_json())
+    return 'User added'
+
+if __name__ == '__main__':
+ app.run() 
\ No newline at end of file
diff --git a/sqlremote/requirements.txt b/sqlremote/requirements.txt
new file mode 100644
index 0000000..f423bc5
--- /dev/null
+++ b/sqlremote/requirements.txt
@@ -0,0 +1,5 @@
+Flask==2.0.1
+psycopg2==2.8.3
+psycopg2-binary==2.8.3
+PyMySQL==0.9.3
+SQLAlchemy==1.3.8
\ No newline at end of file
diff --git a/webtemplates/.gcloudignore b/webtemplates/.gcloudignore
new file mode 100644
index 0000000..603f0b6
--- /dev/null
+++ b/webtemplates/.gcloudignore
@@ -0,0 +1,19 @@
+# This file specifies files that are *not* uploaded to Google Cloud
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# Python pycache:
+__pycache__/
+# Ignored by the build system
+/setup.cfg
\ No newline at end of file
diff --git a/webtemplates/app.yaml b/webtemplates/app.yaml
new file mode 100644
index 0000000..35c5e33
--- /dev/null
+++ b/webtemplates/app.yaml
@@ -0,0 +1,21 @@
+runtime: python39
+
+# [START gae_python37_cloudsql_config]
+env_variables:
+  CLOUD_SQL_USERNAME: gabby
+  CLOUD_SQL_PASSWORD: 4321
+  CLOUD_SQL_DATABASE_NAME: welcome
+  CLOUD_SQL_CONNECTION_NAME: ad-assignment-335217:europe-west2:ad-assignment
+# [END gae_python37_cloudsql_config]
+
+handlers:
+- url: /images
+  static_dir: images
+
+- url: /static
+  static_dir: static
+
+- url: /.*
+  script: auto
+  #script: app.my_app
+  
\ No newline at end of file
diff --git a/webtemplates/images/1.jpg b/webtemplates/images/1.jpg
new file mode 100644
index 0000000..e2fcbc3
Binary files /dev/null and b/webtemplates/images/1.jpg differ
diff --git a/webtemplates/images/10.jpg b/webtemplates/images/10.jpg
new file mode 100644
index 0000000..d8f882e
Binary files /dev/null and b/webtemplates/images/10.jpg differ
diff --git a/webtemplates/images/11.jpg b/webtemplates/images/11.jpg
new file mode 100644
index 0000000..1ca3aa2
Binary files /dev/null and b/webtemplates/images/11.jpg differ
diff --git a/webtemplates/images/12.jpg b/webtemplates/images/12.jpg
new file mode 100644
index 0000000..5b6f54b
Binary files /dev/null and b/webtemplates/images/12.jpg differ
diff --git a/webtemplates/images/2.jpg b/webtemplates/images/2.jpg
new file mode 100644
index 0000000..0952568
Binary files /dev/null and b/webtemplates/images/2.jpg differ
diff --git a/webtemplates/images/3.jpg b/webtemplates/images/3.jpg
new file mode 100644
index 0000000..ccbf74e
Binary files /dev/null and b/webtemplates/images/3.jpg differ
diff --git a/webtemplates/images/4.jpg b/webtemplates/images/4.jpg
new file mode 100644
index 0000000..8f60e80
Binary files /dev/null and b/webtemplates/images/4.jpg differ
diff --git a/webtemplates/images/5.jpg b/webtemplates/images/5.jpg
new file mode 100644
index 0000000..79d1f7e
Binary files /dev/null and b/webtemplates/images/5.jpg differ
diff --git a/webtemplates/images/6.jpg b/webtemplates/images/6.jpg
new file mode 100644
index 0000000..4c0acb1
Binary files /dev/null and b/webtemplates/images/6.jpg differ
diff --git a/webtemplates/images/7.jpg b/webtemplates/images/7.jpg
new file mode 100644
index 0000000..a741b6c
Binary files /dev/null and b/webtemplates/images/7.jpg differ
diff --git a/webtemplates/images/8.jpg b/webtemplates/images/8.jpg
new file mode 100644
index 0000000..7b84b15
Binary files /dev/null and b/webtemplates/images/8.jpg differ
diff --git a/webtemplates/images/9.jpg b/webtemplates/images/9.jpg
new file mode 100644
index 0000000..b6b5711
Binary files /dev/null and b/webtemplates/images/9.jpg differ
diff --git a/webtemplates/images/Logo.png b/webtemplates/images/Logo.png
new file mode 100644
index 0000000..3f526d9
Binary files /dev/null and b/webtemplates/images/Logo.png differ
diff --git a/webtemplates/index.yaml b/webtemplates/index.yaml
new file mode 100644
index 0000000..eeb0f77
--- /dev/null
+++ b/webtemplates/index.yaml
@@ -0,0 +1,20 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+indexes:
+- kind: visit
+  ancestor: yes
+  properties:
+  - name: timestamp
+    direction: desc
\ No newline at end of file
diff --git a/webtemplates/main.py b/webtemplates/main.py
new file mode 100644
index 0000000..aecfb4a
--- /dev/null
+++ b/webtemplates/main.py
@@ -0,0 +1,103 @@
+import logging
+import pymongo
+from pymongo import MongoClient
+from bson.json_util import dumps
+import os
+import requests
+import pymysql
+import json
+import datetime
+from google.auth.transport import requests
+from google.cloud import datastore
+import google.oauth2.id_token
+from flask import Flask, render_template, request, jsonify,redirect
+
+
+#SQL connection
+db_user = os.environ.get('CLOUD_SQL_USERNAME')
+db_password = os.environ.get('CLOUD_SQL_PASSWORD')
+db_name = os.environ.get('CLOUD_SQL_DATABASE_NAME')
+db_connection_name = os.environ.get('CLOUD_SQL_CONNECTION_NAME')
+
+
+app = Flask(__name__)
+@app.route('/')
+
+#Render main templates
+@app.route('/home')
+def home():
+ user=get_user()
+ message=main()
+ return render_template('home.html',data=user, msg=message)
+
+@app.route('/products')
+def products():
+ return render_template('products.html')
+
+@app.route('/contact')
+def contact():
+ return render_template('contact.html')
+
+@app.route('/register')
+def form():
+ return render_template('register.html')
+
+@app.errorhandler(500)
+def server_error(e):
+ # Log the error and stacktrace.
+ logging.exception('An error occurred during a request.')
+ return 'An internal error occurred.', 500
+
+@app.errorhandler(404)
+def page_not_found(error):
+ return render_template('404.html'), 404
+
+#get data from MongoDB
+def get_user():
+    try:
+        client = MongoClient("mongodb+srv://gabbybu:0602@assignment.u61bh.mongodb.net/myFirstDatabase?retryWrites=true&w=majority")
+
+        db=client.assignment
+
+        myCursor=db.test.find({})
+
+        list_cur=list(myCursor)
+        print(list_cur)
+
+        json_data=dumps(list_cur)
+
+        return json_data
+    except Exception as exc:
+        return str(exc)
+
+
+#SQL connection
+def main():
+    # When deployed to App Engine, the `GAE_ENV` environment variable will be
+    # set to `standard`
+    if os.environ.get('GAE_ENV') == 'standard':
+        # If deployed, use the local socket interface for accessing Cloud SQL
+        unix_socket = '/cloudsql/{}'.format(db_connection_name)
+        cnx = pymysql.connect(user=db_user, password=db_password,
+                              unix_socket=unix_socket, db=db_name)
+    else:
+        # If running locally, use the TCP connections instead
+        host = '127.0.0.1'
+        cnx = pymysql.connect(user=db_user, password=db_password,
+                              host=host, db=db_name)
+
+    try:
+        with cnx.cursor() as cursor:
+            cursor.execute('select welcome_txt from welcome_tbl;')
+            result = cursor.fetchall()
+            current_msg = result[0][0]
+        cnx.close()
+
+        return str(current_msg)
+    except Exception as exce:
+        return str(exce)
+# [END gae_python37_cloudsql_mysql]
+
+if __name__ == '__main__':
+ # Only run for local development.
+ app.run(host='127.0.0.1', port=8080, debug=True)
diff --git a/webtemplates/requirements.txt b/webtemplates/requirements.txt
new file mode 100644
index 0000000..8db23bb
--- /dev/null
+++ b/webtemplates/requirements.txt
@@ -0,0 +1,11 @@
+Flask==2.0.1
+google-cloud-datastore==2.1.6
+google-auth==1.31.0
+requests==2.26.0
+pymongo
+dnspython 
+PyMySQL==1.0.2
+Flask==2.0.1
+psycopg2==2.8.3
+psycopg2-binary==2.8.3
+SQLAlchemy==1.3.8
\ No newline at end of file
diff --git a/webtemplates/static/css/custom.css b/webtemplates/static/css/custom.css
new file mode 100644
index 0000000..ada3a18
--- /dev/null
+++ b/webtemplates/static/css/custom.css
@@ -0,0 +1,138 @@
+/*Globals*/
+*{
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+    font-family: 'poppins' sans-serif;
+}
+
+/*Header and Nav Bar*/
+header{
+    background-color: #013D46;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    padding: 15px 8%;
+}
+.logo{
+    cursor: pointer;
+    margin-right: auto;
+    width: 130px;
+    height: 100%;
+}
+.nav_links{
+    list-style: none;
+}
+.nav_links li{
+    display: inline-block;
+    padding: 0px 20px;
+}
+.nav_links li a{
+    transition: all 0.4s ease 0s;
+}
+.nav_links li a:hover{
+    color: #088296;
+}
+button{
+    padding: 9px 25px;
+    background-color: rgba(8, 130, 150, 1);
+    border: none;
+    border-radius: 30px;
+    cursor: pointer;
+    transition: all 0.4s ease 0s;
+    margin-left: 21px;
+}
+button:hover{
+    background-color: rgba(8, 130, 150, 0.6);
+}
+li, a, button{
+    font-family: 'poppins' sans-serif;
+    font-weight: 500;
+    font-size: 18px;
+    color: #fff;
+    text-decoration: none;
+    list-style-type: none;
+}
+
+/*Website Description*/
+.description{
+    color: #00181c;
+    background-color: rgba(8, 130, 150, 0.1);
+    padding: 150px 8%;
+    text-align: center;
+}
+.description-2{
+    color: #00181c;
+    background-color: rgba(8, 130, 150, 0.1);
+    padding: 150px 8%;
+    text-align: center;
+    height: 100vh;
+}
+.description-2 h3 a{
+    color: #00181c !important;
+}
+.description h1{
+    padding-bottom: 30px;
+}
+
+/*Image Gallery*/
+.container{
+    width: 100%;
+    min-height: 100vh;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 70px 8%;
+}
+.gallery{
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+    grid-gap: 30px;
+}
+.gallery img{
+    width: 100%;
+    display: block;
+}
+.image{
+    position: relative;
+}
+.image_overlay{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.7);
+    color: #fff;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    opacity: 0;
+    transition: opacity 0.4s;
+}
+.image_overlay:hover{
+    opacity: 1;
+}
+.image_title a{
+    padding: 10px 20px;
+    font-size: 1.5em;
+    background-color: #088296;
+    border-radius: 30px;
+    transition: all 0.4s ease 0s;
+}
+.image_title a:hover{
+    background-color: #32d5ee;
+    
+}
+
+/*Footer*/
+footer{
+    background-color: #013D46;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    padding: 15px 8%;
+    color: #fff;
+    font-size: 18px;
+}
\ No newline at end of file
diff --git a/webtemplates/templates/404.html b/webtemplates/templates/404.html
new file mode 100644
index 0000000..9c5a1c7
--- /dev/null
+++ b/webtemplates/templates/404.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% block content %}
+ <div>
+ <h3> 404 - <b>{{ request.path }}</b> </h3>
+ <p> The requested URL was not found on the server. If you entered the URL ma
+nually please check your spelling and try again. </p>
+ </div>
+{% endblock %} 
diff --git a/webtemplates/templates/base.html b/webtemplates/templates/base.html
new file mode 100644
index 0000000..a3baf4a
--- /dev/null
+++ b/webtemplates/templates/base.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Advanced Development Assignment</title>
+    <!--Custom Stylesheet-->
+    <link rel="stylesheet" href="/static/css/custom.css">
+ </head>
+<body>
+<!--Header-->
+{% set navigation_bar = [('/', 'home', 'Home'), ('/products', 'products', 'Products'), ('/contact', 'contact', 'Contact'), ('/register','register','Register')] -%}
+ {% set active_page = active_page|default('home') -%} 
+<header>
+    <img class="logo" src="/images/Logo.png" alt="logo">
+    <nav>
+        <ul class="nav_links">
+            {% for href, id, caption in navigation_bar %}
+            {% if id == active_page %}
+            <li class="active"><a href="{{ href|e }}">{{ caption|e }}</a></li>
+            {% else %}
+            <li><a href="{{ href|e }}">{{ caption|e }}</a></li>
+            {% endif %}
+            {% endfor %}
+        </ul>
+    </nav>
+</header>
+<!-- Content -->
+<main role="main">
+    <!-- Content -->
+    {% block content %}
+    {% endblock %}
+    </main><!-- /.container -->
+</div>
+<footer>
+    <img class="logo" src="/images/Logo.png" alt="logo">
+    <p>AD Assignment, s5114467</p>
+</footer>
+</body>
+ </html>
\ No newline at end of file
diff --git a/webtemplates/templates/contact.html b/webtemplates/templates/contact.html
new file mode 100644
index 0000000..bdd54ec
--- /dev/null
+++ b/webtemplates/templates/contact.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% set active_page = "contact" %}
+{% block content %}
+<div class="description-2">
+    <h1>Contact us using the follwing:</h1>
+    <h3><a href = "mailto: fencofurniture@fenco.com">fencofurniture@fenco.com</a></h3>
+    <h3><a href="tel:+00000000000">+00 000 000 000</a></h3>
+</div>
+{% endblock %}
+
diff --git a/webtemplates/templates/home.html b/webtemplates/templates/home.html
new file mode 100644
index 0000000..72aa024
--- /dev/null
+++ b/webtemplates/templates/home.html
@@ -0,0 +1,108 @@
+{% extends "base.html" %}
+{% block content %}
+<div class="description">
+    <h1>Welcome to Fenco's Furniture</h1>
+    <h3>{{data}}</h3>
+    <h3>{{msg}}</h3>
+</div>
+<div class="container">
+    <div class="gallery">
+        <div class="image">
+            <img src="/images/1.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/2.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/3.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/4.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/5.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/6.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/7.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/8.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/9.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/10.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/11.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+        <div class="image">
+            <img src="/images/12.jpg">
+            <div class="image_overlay">
+                <div class="image_title">
+                    <a href="#">View Products</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %} 
\ No newline at end of file
diff --git a/webtemplates/templates/products.html b/webtemplates/templates/products.html
new file mode 100644
index 0000000..ac14572
--- /dev/null
+++ b/webtemplates/templates/products.html
@@ -0,0 +1,47 @@
+{% extends "base.html" %}
+{% set active_page = "products" %}
+{% block content %}
+<div class="description">
+    <h1>View our range of products</h1>
+</div>
+<div class="container">
+    <div class="gallery">
+        <div class="image">
+            <img src="/images/1.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/2.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/3.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/4.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/5.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/6.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/7.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/8.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/9.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/10.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/11.jpg">
+        </div>
+        <div class="image">
+            <img src="/images/12.jpg">
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/webtemplates/templates/register.html b/webtemplates/templates/register.html
new file mode 100644
index 0000000..84f86db
--- /dev/null
+++ b/webtemplates/templates/register.html
@@ -0,0 +1,4 @@
+{% extends "base.html" %}
+{% block content %}
+<p>foo</p>
+{% endblock %}