From 9ee4b88dca1b44f7f25365cc427ee70921ca195c Mon Sep 17 00:00:00 2001 From: Samuel Torres <42902403+Rilladubz@users.noreply.github.com> Date: Sun, 23 May 2021 11:43:06 -0400 Subject: [PATCH 1/2] Initial Commit --- app/styles/app.css | 23 ++++ app/tailwind/modules.css | 10 +- app/templates/application.hbs | 214 +++++++++++++++++++++++++++++++++- package-lock.json | 5 + package.json | 3 +- yarn.lock | 5 + 6 files changed, 251 insertions(+), 9 deletions(-) diff --git a/app/styles/app.css b/app/styles/app.css index e69de29..93bec6e 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -0,0 +1,23 @@ +@import 'tailwind.css'; + +.hover-target .show-on-hover { + opacity: 0; + filter: alpha(opacity=0); +} +.hover-target:hover .show-on-hover, +.hover-target .show-on-hover:focus, +.hover-target .show-on-hover:active { + opacity: 1; + filter: alpha(opacity=1); +} + +.sr-only { + clip-path: inset(50%); + clip: rect(1px, 1px, 1px, 1px); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} diff --git a/app/tailwind/modules.css b/app/tailwind/modules.css index 318bc86..493043e 100644 --- a/app/tailwind/modules.css +++ b/app/tailwind/modules.css @@ -5,28 +5,28 @@ * You can see the styles here: * https://github.com/tailwindcss/tailwindcss/blob/master/css/preflight.css */ -@import "tailwindcss/preflight"; +@import 'tailwindcss/preflight'; /** * This injects any component classes registered by plugins. */ -@import "tailwindcss/components"; +@import 'tailwindcss/components'; /** * Here you would add any of your custom component classes; stuff that you'd * want loaded *before* the utilities so that the utilities could still * override them. */ -@import "./components/*.css"; +@import './components/*.css'; /** * This injects all of Tailwind's utility classes, generated based on your * config file. */ -@import "tailwindcss/utilities"; +@import 'tailwindcss/utilities'; /** * Here you would add any custom utilities you need that don't come out of the * box with Tailwind. */ -@import "./utilities/*.css"; +@import './utilities/*.css'; diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 7b1b104..dc44a40 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,5 +1,213 @@ -{{!-- The following component displays Ember's default welcome message. --}} - -{{!-- Feel free to remove this! --}} + + + + + + + +
+ + +
+
+

+ + general +

+ +

+ Just some general people generally chatting about general things +

+
+ +
+ + + + + +
+
+ + +
+ + +
+
+ +
+ +
+
+ + Lisa Huang-North + + at + +
+ +

+ Would you like to join my professional network? +

+
+ + +
+ + +
+
+ +
+ +
+
+ + Mike North + + at + +
+ +

+ Hello developer, I looked at your profile and am impressed by your 14 + years of COBOL experience. Are you happy in your current role? +

+
+ + +
+ +
+ + +
+
+

+ Message Input +

+ + + + + + + + +
+
+
{{outlet}} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 9a89187..93edb61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13814,6 +13814,11 @@ } } }, + "yarn": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.10.tgz", + "integrity": "sha512-IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA==" + }, "yeast": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", diff --git a/package.json b/package.json index a7f3c40..3629c88 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,8 @@ "dependencies": { "ember-fetch": "^6.5.1", "fastboot-app-server": "^1.1.2-beta.1", - "json-server": "^0.14.2" + "json-server": "^0.14.2", + "yarn": "^1.22.10" }, "volta": { "node": "12.1.0", diff --git a/yarn.lock b/yarn.lock index ddd01f9..2ed3481 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9935,6 +9935,11 @@ yargs@^12.0.2: y18n "^3.2.1 || ^4.0.0" yargs-parser "^11.1.1" +yarn@^1.22.10: + version "1.22.10" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.10.tgz#c99daa06257c80f8fa2c3f1490724e394c26b18c" + integrity sha512-IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA== + yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" From 7e9cd765d28ef213bd5f1974d75224f08b654e7b Mon Sep 17 00:00:00 2001 From: Samuel Torres <42902403+Rilladubz@users.noreply.github.com> Date: Sun, 23 May 2021 12:04:08 -0400 Subject: [PATCH 2/2] Separated the application handle bar out to several components. The handlebars components can be separated and then combined like so component name: assigned-name.hbs, importing convention: ... use pascal case to call. --- app/templates/application.hbs | 172 +------------------- app/templates/components/channel-footer.hbs | 26 +++ app/templates/components/channel-header.hbs | 27 +++ app/templates/components/message.hbs | 29 ++++ app/templates/components/team-selector.hbs | 32 ++++ app/templates/components/team-sidebar.hbs | 53 ++++++ 6 files changed, 172 insertions(+), 167 deletions(-) create mode 100644 app/templates/components/channel-footer.hbs create mode 100644 app/templates/components/channel-header.hbs create mode 100644 app/templates/components/message.hbs create mode 100644 app/templates/components/team-selector.hbs create mode 100644 app/templates/components/team-sidebar.hbs diff --git a/app/templates/application.hbs b/app/templates/application.hbs index dc44a40..26f4ff6 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,153 +1,16 @@ - - - - - +
- -
-
-

- - general -

- -

- Just some general people generally chatting about general things -

-
- -
- - - - - -
-
+
- -
-
- -
- -
-
- - Lisa Huang-North - - at - -
- -

- Would you like to join my professional network? -

-
- - -
+
@@ -182,32 +45,7 @@
- -
-
-

- Message Input -

- - - - - - - - -
-
+
{{outlet}} \ No newline at end of file diff --git a/app/templates/components/channel-footer.hbs b/app/templates/components/channel-footer.hbs new file mode 100644 index 0000000..b3de2d2 --- /dev/null +++ b/app/templates/components/channel-footer.hbs @@ -0,0 +1,26 @@ + +
+
+

+ Message Input +

+ + + + + + + + +
+
\ No newline at end of file diff --git a/app/templates/components/channel-header.hbs b/app/templates/components/channel-header.hbs new file mode 100644 index 0000000..9210976 --- /dev/null +++ b/app/templates/components/channel-header.hbs @@ -0,0 +1,27 @@ + +
+
+

+ + general +

+ +

+ Just some general people generally chatting about general things +

+
+ +
+ + + + + +
+
\ No newline at end of file diff --git a/app/templates/components/message.hbs b/app/templates/components/message.hbs new file mode 100644 index 0000000..0441258 --- /dev/null +++ b/app/templates/components/message.hbs @@ -0,0 +1,29 @@ + +
+
+ +
+ +
+
+ + Lisa Huang-North + + at + +
+ +

+ Would you like to join my professional network? +

+
+ + +
\ No newline at end of file diff --git a/app/templates/components/team-selector.hbs b/app/templates/components/team-selector.hbs new file mode 100644 index 0000000..1e20808 --- /dev/null +++ b/app/templates/components/team-selector.hbs @@ -0,0 +1,32 @@ + + \ No newline at end of file diff --git a/app/templates/components/team-sidebar.hbs b/app/templates/components/team-sidebar.hbs new file mode 100644 index 0000000..4711cad --- /dev/null +++ b/app/templates/components/team-sidebar.hbs @@ -0,0 +1,53 @@ + + \ No newline at end of file