diff --git a/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json index 27219d8..11a3cf8 100644 --- a/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "\\.png", + "filename" : "Group 73 (6).png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/ios/App/App/Assets.xcassets/AppIcon.appiconset/Group 73 (6).png b/ios/App/App/Assets.xcassets/AppIcon.appiconset/Group 73 (6).png new file mode 100644 index 0000000..a1607ff Binary files /dev/null and b/ios/App/App/Assets.xcassets/AppIcon.appiconset/Group 73 (6).png differ diff --git "a/ios/App/App/Assets.xcassets/AppIcon.appiconset/\\.png" "b/ios/App/App/Assets.xcassets/AppIcon.appiconset/\\.png" deleted file mode 100644 index 5556ab0..0000000 Binary files "a/ios/App/App/Assets.xcassets/AppIcon.appiconset/\\.png" and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json b/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json index e387a49..67decca 100644 --- a/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json +++ b/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "splash.png", + "filename" : "Group 74.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "splash 1.png", + "filename" : "Group 75.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "splash 2.png", + "filename" : "Group 76.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Group 74.png b/ios/App/App/Assets.xcassets/Splash.imageset/Group 74.png new file mode 100644 index 0000000..30c03dc Binary files /dev/null and b/ios/App/App/Assets.xcassets/Splash.imageset/Group 74.png differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Group 75.png b/ios/App/App/Assets.xcassets/Splash.imageset/Group 75.png new file mode 100644 index 0000000..30c03dc Binary files /dev/null and b/ios/App/App/Assets.xcassets/Splash.imageset/Group 75.png differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Group 76.png b/ios/App/App/Assets.xcassets/Splash.imageset/Group 76.png new file mode 100644 index 0000000..30c03dc Binary files /dev/null and b/ios/App/App/Assets.xcassets/Splash.imageset/Group 76.png differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash 1.png b/ios/App/App/Assets.xcassets/Splash.imageset/splash 1.png deleted file mode 100644 index 22e43b8..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/splash 1.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash 2.png b/ios/App/App/Assets.xcassets/Splash.imageset/splash 2.png deleted file mode 100644 index 22e43b8..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/splash 2.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash.png b/ios/App/App/Assets.xcassets/Splash.imageset/splash.png deleted file mode 100644 index 22e43b8..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/splash.png and /dev/null differ diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index 883712e..0b9c151 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -40,15 +40,10 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight UIViewControllerBasedStatusBarAppearance diff --git a/src/Home/Home.js b/src/Home/Home.js index 0766edf..9e4a62c 100644 --- a/src/Home/Home.js +++ b/src/Home/Home.js @@ -1,6 +1,6 @@ import "../components/Sidebar.js" import "../components/AppMenu.js" -import "../components/AppWindow.js" +import "../components/AppWindowContainer.js" class Home extends Shadow { @@ -24,7 +24,7 @@ class Home extends Shadow { Sidebar() VStack(() => { - AppWindow() + AppWindowContainer() AppMenu() }) diff --git a/src/_/code/shared.css b/src/_/code/shared.css index 7f33f87..227cdc0 100644 --- a/src/_/code/shared.css +++ b/src/_/code/shared.css @@ -11,9 +11,15 @@ --red: #ff0000; --quillred: #DE3F3F; --brown: #812A18; + + --sidebar: #4e765f; + --divider: #523636; --darkbrown: #3f0808; --darkgrey: #5c4646; + --headertext: #433c36e2; + --searchbackground: #dfc9ac; + --home-src: /_/icons/home.svg; --home-selected-src: /_/icons/homelightselected.svg; --people-src: /_/icons/people.svg; @@ -43,10 +49,13 @@ --accent: #3D2622; --darkaccent: #240609; --text: #FADFB6; + + --sidebar: #240609; --divider: #523636; --darktext: #62473E; - --headertext: #a2907d; + --headertext: #ffd8bbe2; --darkred: #6b2c1d; + --searchbackground: #260F0C; --home-src: /_/icons/homelight.svg; diff --git a/src/apps/Announcements/Announcements.js b/src/apps/Announcements/Announcements.js index 328fd87..3d555d4 100644 --- a/src/apps/Announcements/Announcements.js +++ b/src/apps/Announcements/Announcements.js @@ -3,7 +3,7 @@ import "../../components/TopBar.js" class Announcements extends Shadow { render() { VStack(() => { - TopBar() + }) .boxSizing("border-box") .backgroundColor("var(--main)") diff --git a/src/apps/Events/Events.js b/src/apps/Events/Events.js index d4995a4..a36d117 100644 --- a/src/apps/Events/Events.js +++ b/src/apps/Events/Events.js @@ -38,7 +38,6 @@ class Events extends Shadow { render() { VStack(() => { - TopBar() SearchBar() diff --git a/src/apps/Jobs/Jobs.js b/src/apps/Jobs/Jobs.js index af4e0ca..c77d9d1 100644 --- a/src/apps/Jobs/Jobs.js +++ b/src/apps/Jobs/Jobs.js @@ -39,7 +39,6 @@ class Jobs extends Shadow { render() { VStack(() => { - TopBar() // JobForm() diff --git a/src/apps/People/People.js b/src/apps/People/People.js index e90f917..07f9302 100644 --- a/src/apps/People/People.js +++ b/src/apps/People/People.js @@ -25,7 +25,6 @@ class People extends Shadow { render() { VStack(() => { - TopBar() VStack(() => { if (this.people == "") { diff --git a/src/apps/People/PeopleCard.js b/src/apps/People/PeopleCard.js index 4538ddc..9315bfa 100644 --- a/src/apps/People/PeopleCard.js +++ b/src/apps/People/PeopleCard.js @@ -13,7 +13,7 @@ class PeopleCard extends Shadow { .paddingHorizontal(0.5, em) .border("1px solid var(--accent)") .borderRadius(100, pct) - .background("black") + .background("var(--darkaccent)") VStack(() => { p(this.person.first_name + " " + this.person.last_name) diff --git a/src/components/AppWindow.js b/src/components/AppWindow.js index 60d7454..e43cbfe 100644 --- a/src/components/AppWindow.js +++ b/src/components/AppWindow.js @@ -9,32 +9,28 @@ class AppWindow extends Shadow { render() { ZStack(() => { let app = global.currentApp() - switch(app) { - case "Dashboard": - Announcements() - break; + switch(app) { + case "Dashboard": + Announcements() + break; + + case "Messages": + Messages() + break; + + case "People": + People() + break; - case "Messages": - Messages() - break; + case "Jobs": + Jobs() + break; - case "People": - People() - break; - - case "Jobs": - Jobs() - break; - - case "Events": - Events() - break; - } + case "Events": + Events() + break; + } }) - .height(100, pct) - .overflowY("hidden") - .display("flex") - .position("relative") .onNavigate(() => { this.rerender() }) diff --git a/src/components/AppWindowContainer.js b/src/components/AppWindowContainer.js new file mode 100644 index 0000000..5d6e9c4 --- /dev/null +++ b/src/components/AppWindowContainer.js @@ -0,0 +1,22 @@ +import "./AppWindow.js" + +class AppWindowContainer extends Shadow { + render() { + ZStack(() => { + + VStack(() => { + TopBar() + + AppWindow() + }) + .width(100, pct) + .gap(0) + }) + .height(100, pct) + .overflowY("hidden") + .display("flex") + .position("relative") + } +} + +register(AppWindowContainer) \ No newline at end of file diff --git a/src/components/SearchBar.js b/src/components/SearchBar.js index 3a6b522..cf1f433 100644 --- a/src/components/SearchBar.js +++ b/src/components/SearchBar.js @@ -1,23 +1,35 @@ +css(` + searchbar- input::placeholder { + color: #5C504D + } +`) + class SearchBar extends Shadow { render() { HStack(() => { - input("Search (coming soon!)", "80%") + input("Search", "80%") .attr({ - "type": "text", - "disabled": "true" + "type": "text" }) .paddingVertical(0.75, em) .boxSizing("border-box") .paddingHorizontal(1, em) - .background("var(--darkaccent)") + .background("var(--searchbackground)") .color("gray") .marginBottom(1, em) - .border("1px solid var(--accent") + .border("1px solid color-mix(in srgb, var(--accent) 60%, transparent)") .borderRadius(100, px) .fontFamily("Arial") .fontSize(1, em) .outline("none") .cursor("not-allowed") + .onTouch(function (start) { + if(start) { + this.style.backgroundColor = "var(--accent)" + } else { + this.style.backgroundColor = "var(--searchbackground)" + } + }) p("+") .fontWeight("bolder") diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js index 75f5180..e1952ea 100644 --- a/src/components/Sidebar.js +++ b/src/components/Sidebar.js @@ -26,19 +26,20 @@ class Sidebar extends Shadow { .paddingTop(30, vh) .height(100, vh) .width(70, vw) - .borderLeft("1px solid black") + .borderLeft("1px solid var(--divider)") + .color("var(--text)") .position("fixed") - .background("var(--main)") - .xRight(-70, vw) + .background("var(--sidebar)") + .xRight(-71, vw) .transition("right .3s") - .zIndex(1) + .zIndex(3) } toggle() { - if(this.style.right === "-70vw") { + if(this.style.right === "-71vw") { this.style.right = "0vw" } else { - this.style.right = "-70vw" + this.style.right = "-71vw" } } } diff --git a/src/components/TopBar.js b/src/components/TopBar.js index 53eb5ee..a10c3fb 100644 --- a/src/components/TopBar.js +++ b/src/components/TopBar.js @@ -2,14 +2,18 @@ class TopBar extends Shadow { render() { HStack(() => { img(`/db/images/${global.currentNetwork.logo}`, "2.5em", "2.5em") - .onTouch(function (start) { - if(start) { - this.style.scale = "0.8" - } else if(start === false) { - this.style.scale = "" - $("sidebar-").toggle() - } - }) + .borderRadius("50", pct) + .objectFit("cover") + .padding(0.3, em) + .background("var(--accent)") + .onTouch(function (start) { + if(start) { + this.style.scale = "0.8" + } else if(start === false) { + this.style.scale = "" + $("sidebar-").toggle() + } + }) p(global.currentApp()) .color("var(--headertext)") @@ -23,6 +27,9 @@ class TopBar extends Shadow { .verticalAlign("center") .gap(0.5, em) .marginTop(3, em) + .onNavigate(() => { + this.$("p").innerText = global.currentApp() + }) } } diff --git a/src/public/_/icons/columnwhite.svg b/src/public/_/icons/columnwhite.svg index 2258d5b..11e6f6c 100644 --- a/src/public/_/icons/columnwhite.svg +++ b/src/public/_/icons/columnwhite.svg @@ -1,7 +1,9 @@ - - - - - - + + + + + + + +