diff --git a/.idea/config/applicationhost.config b/.idea/config/applicationhost.config
index 175860584ece02bbf276b4eeaaabf2f8c0576d5d..0bc46220f03301b3f96505fa265626d91633bd59 100644
--- a/.idea/config/applicationhost.config
+++ b/.idea/config/applicationhost.config
@@ -156,7 +156,7 @@
<virtualDirectoryDefaults allowSubDirConfig="true" />
<site name="CI-ColorWebs" id="1">
<application path="/" applicationPool="CI-ColorWebs AppPool">
- <virtualDirectory path="/" physicalPath="C:\Users\aidan\Documents\GitHub\color-website2\CI-ColorWebs" />
+ <virtualDirectory path="/" physicalPath="C:\Users\Jagroop\Desktop\drexel\spring 2022\Ci 102\color-website\CI-ColorWebs" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:23781:localhost" />
diff --git a/CI-ColorWebs/Pages/About Us.cshtml b/CI-ColorWebs/Pages/About Us.cshtml
new file mode 100644
index 0000000000000000000000000000000000000000..de0c5e4281f18428f268c6ccb9874cc1cd94c49d
--- /dev/null
+++ b/CI-ColorWebs/Pages/About Us.cshtml
@@ -0,0 +1,60 @@
+@page
+@model About_Us
+
+@{
+ ViewData["Title"] = "About Us";
+}
+
+<body class = "AboutUsBody">
+<div class = "AboutUsDivMain">
+ <h1 class = "AboutUsHeader">"Draw from Randomness"</h1>
+ <div class = "AboutUsDiv">
+ <h2 class="AboutUsMission">Our Mission</h2>
+ <p class = "AboutUsMissionText">We aim to provide inspiration and guide innovative creation for all artists.</p>
+ </div>
+</div>
+
+<div class = "AboutUsPeopleParent">
+ <div class = "AboutUsPeople">
+ <div class = "AboutUsImageContainer">
+
+ </div>
+ <h1 class = "AboutUsNames">Jagroop Gill</h1>
+ <h2 class = "AboutUsMajor">Major: Computer Science</h2>
+ <p class = "AboutUsContact">Contact: jsg362@drexel.edu</p>
+ </div>
+
+
+ <div class = "AboutUsPeople">
+
+ <div class="AboutUsImageContainer">
+
+ </div>
+ <h1 class = "AboutUsNames">Aidan Leyden</h1>
+ <h2 class = "AboutUsMajor">Major: Software Engineering</h2>
+ <p class = "AboutUsContact">Contact: asl337@drexel.edu</p>
+
+ </div>
+
+
+ <div class = "AboutUsPeople">
+ <div class="AboutUsImageContainer">
+
+ </div>
+ <h1 class = "AboutUsNames">Akhil Binumon</h1>
+ <h2 class = "AboutUsMajor">Major: Computer Science</h2>
+ <p class = "AboutUsContact">Contact: ayb32@drexel.edu</p>
+ </div>
+
+ <div class = "AboutUsPeople">
+ <div class="AboutUsImageContainer">
+
+ </div>
+ <h1 class = "AboutUsNames">Phillip Phan</h1>
+ <h2 class = "AboutUsMajor">Major: Information Systems</h2>
+ <p class = "AboutUsContact">Contact: php46@drexel.edu</p>
+ </div>
+</div>
+
+</body>
+
diff --git a/CI-ColorWebs/Pages/About Us.cshtml.cs b/CI-ColorWebs/Pages/About Us.cshtml.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e5e75ee4e5b5d5c9cef2f0a658722fc61146941f
--- /dev/null
+++ b/CI-ColorWebs/Pages/About Us.cshtml.cs
@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace CI_ColorWebs.Pages;
+
+public class About_Us : PageModel
+{
+ public void OnGet()
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/CI-ColorWebs/Pages/Index.cshtml b/CI-ColorWebs/Pages/Index.cshtml
index 3299d96d6d0a00f7b7ebb2219aede530f38fc405..b03b563a37726ae84c3f54abe7e7dc3ac8c431f6 100644
--- a/CI-ColorWebs/Pages/Index.cshtml
+++ b/CI-ColorWebs/Pages/Index.cshtml
@@ -17,11 +17,6 @@
<span id="color6"></span>
<canvas width = "700"></canvas>
</h2>
- <h3>
- <p>View your pallete visualized through AI art:</p>
- <span id="linkai"></span>
- </h3>
- <h8>
- <p>(Keep in mind AI art is not perfect and it may take a couple of tries before you get a result you like)</p>
- </h8>
</div>
+
+
diff --git a/CI-ColorWebs/Pages/Shared/_Layout.cshtml b/CI-ColorWebs/Pages/Shared/_Layout.cshtml
index 13310b5fff9aef33d78099c47d4c9bbcf5de914f..97942e98b644b5f6563524af2fd71715f116cf64 100644
--- a/CI-ColorWebs/Pages/Shared/_Layout.cshtml
+++ b/CI-ColorWebs/Pages/Shared/_Layout.cshtml
@@ -25,8 +25,8 @@
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
</li>
- <li class="nav-item">
- <a class="nav-link text-dark" asp-area="" asp-page="/TruePalette">True Palette</a>
+ <li>
+ <a class="nav-link text-dark" asp-area="" asp-page="/About Us">About Us</a>
</li>
</ul>
</div>
diff --git a/CI-ColorWebs/wwwroot/css/site.css b/CI-ColorWebs/wwwroot/css/site.css
index b71897bb22c02b622c5ac85d172e2077743a3598..b3fdae262ae49e437bee2e7f01e7606a3ab0d2ac 100644
--- a/CI-ColorWebs/wwwroot/css/site.css
+++ b/CI-ColorWebs/wwwroot/css/site.css
@@ -20,3 +20,96 @@ html {
body {
margin-bottom: 60px;
}
+
+.AboutUsDivMain {
+ top: 300px;
+}
+
+.AboutUsHeader {
+ text-align: center;
+ font-family: "Optima", monospace;
+ color: #525252;
+ font-size: 100px;
+ font-weight: 500;
+ margin-top: 300px;
+ letter-spacing: 3px;
+}
+
+.AboutUsDiv {
+ width: 90%;
+ height: 450px;
+ background-color: #CCCCCC;
+ border: 20px solid #525252;
+ margin: 350px 5%;
+}
+
+.AboutUsBody {
+ background-color: #CCCCCC;
+
+}
+
+.AboutUsMission {
+ text-align: center;
+ margin-top: 25px;
+ color: black;
+ font-family: "Optima", serif;
+ font-size: 40px;
+ font-weight: 700;
+ letter-spacing: 6px;
+
+}
+.AboutUsMissionText {
+ text-align: center;
+ color: #525252;
+ margin-top: 45px;
+ font-size: 55px;
+ font-family: monospace;
+}
+
+.AboutUsPeopleParent {
+ width: 100%;
+ height: 1200px;
+
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+}
+
+.AboutUsPeople{
+ height: 50%;
+ width: 50%;
+
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+
+.AboutUsImageContainer{
+ height: 40%;
+ width: 60%;
+ top: 15px;
+ left: 20%;
+ border: solid 2px black;
+}
+
+.AboutUsNames{
+ margin-top: 30px;
+ color: black;
+ font-size: 55px;
+ font-weight: 400;
+ font-family: "Aileron", sans-serif;
+}
+
+.AboutUsMajor {
+ margin-top: 40px;
+ margin-bottom: 60px;
+ color: #525252;
+ font-size: 30px;
+ font-family: "Monaco", monospace;
+
+}
+
+.AboutUsContact{
+ font-size: 20px;
+ font-weight: 400;
+}
\ No newline at end of file
diff --git a/CI-ColorWebs/wwwroot/js/site.js b/CI-ColorWebs/wwwroot/js/site.js
index d0904b74312d5c1e8ad56729a7c053b414bdca46..8fc1adffe2966985ab8268e842cfac6c2a136c9c 100644
--- a/CI-ColorWebs/wwwroot/js/site.js
+++ b/CI-ColorWebs/wwwroot/js/site.js
@@ -6,7 +6,6 @@ const canvas = document.querySelector("canvas");
const context = canvas.getContext("2d");
const cre = () => {
var ranColor = [];
- var ailink = ""
for (var i = 0; i <= 5; i++){
const randomColor = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
ranColor.push(randomColor)
@@ -35,9 +34,6 @@ const cre = () => {
context.fillStyle = '#' +ranColor[5];
context.fillRect(460, 0, 70, 100);
document.getElementById("color6").style.color = "#" + ranColor[5];
- ailink = "?prompt=flower%20color(" + ranColor[0]+",%20" + ranColor[1]+ ",%20"+ ranColor[2]+ ",%20"+ ranColor[3]+ ",%20"+ ranColor[4]+ ",%20"+ ranColor[5]+ ")%20painting";
- var link = "<a href='https://www.craiyon.com/" + ailink + "'>here</a>";
- document.getElementById("linkai").innerHTML=link;
}
genNew.addEventListener("click", cre);
diff --git a/CI-ColorWebs/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/CI-ColorWebs/wwwroot/lib/bootstrap/dist/css/bootstrap.css
index 750da4e19b9a8713ad898b0b015d9ada7db62348..8f68f1883a99d542696fed2ea3cdb22e162afe18 100644
--- a/CI-ColorWebs/wwwroot/lib/bootstrap/dist/css/bootstrap.css
+++ b/CI-ColorWebs/wwwroot/lib/bootstrap/dist/css/bootstrap.css
@@ -7628,6 +7628,7 @@ textarea.form-control-lg {
text-transform: uppercase !important;
}
+
.text-capitalize {
text-transform: capitalize !important;
}