diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index ed27723..65bde20 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -185,11 +185,33 @@
"mermaid-tools:Open Mermaid Toolbar": false
}
},
- "active": "ff4e63a36b080692",
+ "active": "3ed058b7ba32ddc0",
"lastOpenFiles": [
+ "Client Server Systems/PHPStorm Repo/workshop4/Views/index.phtml~",
+ "Client Server Systems/PHPStorm Repo/workshop5/calculator.php~",
+ "Client Server Systems/PHPStorm Repo/workshop5/calculator.php",
+ "Client Server Systems/PHPStorm Repo/workshop5/index.php~",
+ "Client Server Systems/PHPStorm Repo/workshop5/Views/template/header.phtml",
+ "Client Server Systems/PHPStorm Repo/workshop5/Views/template/footer.phtml",
+ "Client Server Systems/PHPStorm Repo/workshop5/js/bootstrap.min.js",
+ "Client Server Systems/PHPStorm Repo/workshop5/js/bootstrap.js",
+ "Client Server Systems/PHPStorm Repo/workshop5/images/new_uos_logo.jpg",
+ "Client Server Systems/PHPStorm Repo/workshop5/fonts/glyphicons-halflings-regular.woff",
+ "Client Server Systems/PHPStorm Repo/workshop5/fonts/glyphicons-halflings-regular.ttf",
+ "Client Server Systems/PHPStorm Repo/workshop5/fonts/glyphicons-halflings-regular.svg",
+ "Client Server Systems/PHPStorm Repo/workshop5/fonts/glyphicons-halflings-regular.eot",
+ "Client Server Systems/PHPStorm Repo/workshop4/images/new_uos_logo.jpg",
+ "Client Server Systems/PHPStorm Repo/workshop4/fonts/glyphicons-halflings-regular.svg",
+ "Client Server Systems/PHPStorm Repo/workshop 5/images/new_uos_logo.jpg",
+ "Client Server Systems/PHPStorm Repo/workshop 5/fonts/glyphicons-halflings-regular.svg",
+ "Client Server Systems/PHPStorm Repo/MVCtemplate-24-with-top-navbar/images/new_uos_logo.jpg",
+ "Client Server Systems/PHPStorm Repo/MVCtemplate-24-with-top-navbar/fonts/glyphicons-halflings-regular.svg",
+ "Client Server Systems/PHPStorm Repo/MVCtemplate-23-24/images/new_uos_logo.jpg",
+ "Client Server Systems/PHPStorm Repo/MVCtemplate-23-24/fonts/glyphicons-halflings-regular.svg",
+ "Client Server Systems/PHPStorm Repo/README.md",
+ "PHPStorm/README.md",
"Software Project with Agile Techinques/Week 3/Study Skills - Class Diagrams.md",
"Data Structures/Week 5/Lecture 9 - Stacks.md",
- "Data Structures/Week 5",
"README.md",
"AI & Data Mining/Week 4/Tutorial 4 - Nearest Neighbor.md",
"AI & Data Mining/Week 4/Lecture 7 - Nearest Neighbor.md",
@@ -197,42 +219,20 @@
"Penetration Testing/Week 3/Workshop 3 - netcat.md",
"Penetration Testing/Week 4/Week 4 - Pre-Engagement.md",
"Penetration Testing/Week 4/Workshop 4 - Google Dorking.md",
- "Pasted image 20241011140717.png",
- "Pasted image 20241011140654.png",
- "Pasted image 20241011140611.png",
- "Pasted image 20241011131844.png",
- "Pasted image 20241011131542.png",
"Software Project with Agile Techinques/Week 4/Workshop 4 - SPAT.md",
"Networking and Security/Week 4/Workshop 4 - Routing.md",
- "Software Project with Agile Techinques/Week 4",
"Networking and Security/Week 3/Workshop 3 - Subnetting.md",
"Networking and Security/Week 2/Lecture 3 - IP4 and Subnetting.md",
- "Pasted image 20241010135130.png",
- "Pasted image 20241010133818.png",
"Client Server Systems/Week 3/Workshop 3.md",
- "AI & Data Mining/Week 4",
- "Pasted image 20241010132326.png",
- "Pasted image 20241010132324.png",
- "Client Server Systems/Week 4",
"Data Structures/Week 4/Week 4 - Exceptions.md",
- "Penetration Testing/Week 4",
"Networking and Security/Week 4/Lecture 8.md",
- "Data Structures/Week 4",
"AI & Data Mining/Week 3/Workshop 3.md",
- "Networking and Security/Week 4",
"AI & Data Mining/Week 3/Tutorial 3.md",
"AI & Data Mining/Week 1/Lecture 2 - Input and Output.md",
- "Pasted image 20241004143909.png",
- "AI & Data Mining/Week 3/Untitled.md.partial",
"AI & Data Mining/Week 3/Lecture 5 - Naive Bayes.md",
- "Client Server Systems/Week 3/workshop3/strings.php~",
- "Software Project with Agile Techinques/Week 3",
"Data Structures/Week 1/Lecture 2 - Data Structures & ADTs.md",
"Data Structures/Week 1/Lecture 1 - Module Intro.md",
"Penetration Testing/Week 3/Lecture 3 - Blue Team.md",
- "Data Structures/Week 3/Workshop 3 - ADTs.md",
- "Data Structures/Week 3/Lecture 5 - Linear List.md",
- "Career Development/Week 3/Lecture 3 - Employment Skills.md",
"Database Systems/Untitled.canvas",
"Untitled 1.canvas",
"Untitled.canvas"
diff --git a/Client Server Systems/PHPStorm Repo b/Client Server Systems/PHPStorm Repo
new file mode 160000
index 0000000..9b6cf0b
--- /dev/null
+++ b/Client Server Systems/PHPStorm Repo
@@ -0,0 +1 @@
+Subproject commit 9b6cf0badd74c750b1a3afecd3703e6297cb23f9
diff --git a/Client Server Systems/Week 3/workshop3/.idea/vcs.xml b/Client Server Systems/Week 3/workshop3/.idea/vcs.xml
new file mode 100644
index 0000000..c2365ab
--- /dev/null
+++ b/Client Server Systems/Week 3/workshop3/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
The Views/template directory contains a header.phtml and a footer.phtml which should be included on every new page generated. + To add additional pages just edit the file header.phtml to add the extra link and then add a new Controller (pageN.php) and a new View (pageN.phtml), for each page required.
+The Model code files are placed in the Models directory.
+Do not change any of the css files in the css> directory!
+ + diff --git a/PHPStorm/MVCtemplate-23-24/Views/page1.phtml b/PHPStorm/MVCtemplate-23-24/Views/page1.phtml new file mode 100644 index 0000000..145fd6b --- /dev/null +++ b/PHPStorm/MVCtemplate-23-24/Views/page1.phtml @@ -0,0 +1,5 @@ + + +