fix merge conflicts

NicolasConstant · Dec 21, 2019 · 3fc0b5f · 3fc0b5f
2 parents 345f80a + 7a7b09b
commit 3fc0b5f
Show file tree

Hide file tree

Showing 4,086 changed files with 10,638 additions and 4,792 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,7 @@
+.git
+.gitignore
+.travis.yml
+appveyor.yml
+.vscode
+node_modules
+dist
diff --git a/CREDITS.md b/CREDITS.md
@@ -0,0 +1,5 @@
+# Credits
+
+## Sounds
+* All eyes on me, Exquisite and Appointed are from [Notification Sounds](https://notificationsounds.com/)
+* Mastodon Boop is from the [Mastodon Project](https://github.com/tootsuite/mastodon) and made by [@jk@mastodon.social](https://mastodon.social/@jk)
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,21 @@
+FROM node:10-buster-slim AS build
+
+WORKDIR /build
+ADD . /build
+
+RUN apt update && apt install --yes git binutils
+RUN npm install
+RUN npm run build
+
+FROM alpine:latest
+
+RUN apk add --update --no-cache lighttpd
+
+ADD lighttpd.conf /etc/lighttpd/lighttpd.conf
+COPY --from=build /build/dist /app/sengi
+COPY --from=build /build/assets/docker_init /app
+
+EXPOSE 80
+
+ENTRYPOINT ["lighttpd", "-D"]
+CMD ["-f", "/etc/lighttpd/lighttpd.conf"]
diff --git a/README.md b/README.md
@@ -4,21 +4,25 @@
 
 Sengi is a **Mastodon** and **Pleroma** desktop focused client. It takes inspiration from the old Tweetdeck [client](https://static.makeuseof.com/wp-content/uploads/2012/02/muo-tweetdeck2b.png), the new Tweetdeck webapp and Mastodon UI. 
 
-Focus will be made on the following points:
+It is strongly focused on the following points:
 
   * Heavily oriented on multi-accounts usage 
   * Desktop based interactions (right clic, left clic, etc)
   * One column at a time display (leaves it on the side of your screen, and keep an eye on it while doing your other stuff)
 
-It will be released as a **browser webapp** and also packaged as an **cross-platform desktop application** (Mac, Windows, and Linux).
+It is released as a **browser webapp** and also packaged as an **cross-platform desktop application** (Mac, Windows, and Linux).
+
+## Official project page
+
+[Discover Sengi](https://nicolasconstant.github.io/sengi/)
 
 ## State of development
 
-Sengi is at a very early development stage, a lot has to be done before a first pre-release. 
+Sengi already supporting  all the basics functionalities, but many minors enhancements are still needed before a 1.0.0 release.
 
 ## Screens
 
-soon™
+![/docs/images/presentation_small.gif](/docs/images/presentation_small.gif)
 
 ## Contact
 
@@ -32,12 +36,16 @@ It's a little [elephant shrew](https://en.wikipedia.org/wiki/Elephant_shrew) fro
 
 ## Contribute
 
-Please see the [contributing guidelines](CONTRIBUTING.md).
+Please see the [contributing guidelines](CONTRIBUTING.md)
 
 ## License
 
 This project is licensed under the AGPLv3 License - see [LICENSE](LICENSE) for details
 
+## Credits
+
+See [credits](CREDITS.md)
+
 ## Dependencies 
 
   * [Angular 7](https://github.com/angular/angular)

diff --git a/angular.json b/angular.json
@@ -21,7 +21,8 @@
                             "src/favicon.ico"
                         ],
                         "styles": [
-                            "src/sass/styles.scss"
+                            "src/sass/styles.scss",
+                            "node_modules/@ctrl/ngx-emoji-mart/picker.css"
                         ],
                         "stylePreprocessorOptions": {
                             "includePaths": [

diff --git a/assets/docker_init/favicon.png b/assets/docker_init/favicon.png
diff --git a/assets/docker_init/index.html b/assets/docker_init/index.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link rel="stylesheet" href="main.css">
+    <link rel="shortcut icon" type="image/png" href="favicon.png">
+
+    <title>Sengi Launcher</title>
+</head>
+
+<body>
+    <div class="launcher-wrapper">
+    <div class="launcher">
+        <a href="#" class="button" title="launch sengi in popup"
+            onClick="window.open('/sengi/'+'?qt='+ (new Date()).getTime(),'Sengi','toolbar=no,location=no,status=no,menubar=no,scrollbars=no, resizable=yes,width=377,height=800'); return false;">
+            <span class="download-button__web--label">Launch Sengi Popup</span>
+        </a><br />
+
+        <a href="/sengi/" class="button" title="launch sengi">
+            <span class="download-button__web--label">Open Sengi</span>
+        </a><br />
+    </div>
+    </div>
+</body>
+
+</html>
diff --git a/assets/docker_init/main.css b/assets/docker_init/main.css
@@ -0,0 +1,45 @@
+*, *::after, *::before {
+    margin: 0;
+    padding: 0;
+    box-sizing: inherit;
+}
+
+html {
+    font-size: 62.5%;
+    background-color: #141824;
+    font-family: Verdana, Geneva, sans-serif;
+}
+
+body {
+    box-sizing: border-box;
+    overflow: hidden;
+}
+
+.launcher-wrapper{
+    display: flex;
+    align-items: center; 
+    justify-content: center;
+} 
+
+.launcher {   
+    height: 15rem;
+    width: 30rem;
+    margin: 35vh auto;
+}
+
+.button {
+    background-color: #090b10;
+    display: block;
+    width: 30rem;
+    padding: 1.5rem 2rem 1.75rem 2rem;    
+    color: white;
+    border-radius: 3px;
+    font-size: 1.8rem;
+    font-weight: lighter;
+    text-decoration: none;
+    transition: all .2s;    
+}
+
+.button:hover {
+    background-color: #1e2433;
+}
diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
@@ -94,6 +94,17 @@ body {
       font-weight: 400;
       font-size: 2rem;
       margin-bottom: .5rem; }
+    .header__download-box--buttons {
+      margin-bottom: 5px; }
+  .header__old-releases {
+    transition: all .2s;
+    color: #7a7a7a;
+    float: left;
+    font-size: 1.4rem;
+    text-decoration: none; }
+    .header__old-releases:hover {
+      color: #faa424;
+      text-decoration: underline; }
 
 .download-button {
   transition: all .2s;
@@ -112,24 +123,17 @@ body {
     color: #faa424; }
   .download-button__web {
     font-size: 25px;
-    background-color: #04d431;
-    background-color: #faa424;
-    background-color: #fd9d0d;
     background-color: #3f3f3f;
     color: white;
-    color: #202020;
-    color: white;
     padding: 10px 20px 10px 15px;
     border-radius: 3px;
-    border: 1px solid #ffffff;
     border: 1px solid #e7e7e7; }
     .download-button__web--label {
       font-size: 25px;
       font-weight: normal;
       padding-left: 10px; }
     .download-button__web:hover {
       color: #3d3d3d;
-      background-color: #ffe5be;
       background-color: #faa424; }
 
 .fa-apple {
@@ -143,9 +147,102 @@ body {
   width: 6rem;
   height: 6rem; }
 
+.section {
+  font-family: 'Open Sans', sans-serif; }
+  .section-about {
+    min-height: 10rem;
+    background-color: #141414;
+    color: whitesmoke;
+    padding: 7rem 0; }
+    .section-about__about {
+      font-weight: 300;
+      font-family: 'Open Sans', sans-serif;
+      margin: auto;
+      padding: 0 3rem;
+      text-align: center;
+      font-size: 2.5rem; }
+  .section-clear {
+    font-weight: 300;
+    font-family: 'Open Sans', sans-serif;
+    min-height: 20rem;
+    background-color: whitesmoke;
+    padding: 1rem; }
+    .section-clear__big-title {
+      font-weight: 400;
+      font-size: 3rem;
+      text-align: center; }
+    .section-clear__title {
+      font-weight: 400;
+      font-size: 2.5rem;
+      color: #141414;
+      margin-top: 5rem;
+      margin-left: 15vw; }
+      @media (max-width: 56.25em) {
+        .section-clear__title {
+          margin: 3rem auto 0 auto;
+          text-align: center; } }
+    .section-clear__subtitle {
+      font-weight: 400;
+      font-size: 2rem;
+      color: #141414;
+      margin-left: 1rem;
+      font-style: italic; }
+  .section-separator {
+    height: .5rem;
+    background-color: #141414;
+    background-color: white; }
+
+.quick-overview__video {
+  display: block;
+  margin: 2rem auto;
+  width: 800;
+  height: 492; }
+  @media (max-width: 56.25em) {
+    .quick-overview__video {
+      width: 100%;
+      height: 492; } }
+
+.functionalities__row {
+  max-width: 100rem; }
+
+.functionalities__text {
+  display: block;
+  margin: auto;
+  font-weight: 400;
+  font-size: 2rem;
+  text-align: center;
+  padding: 7rem 5rem 0 5rem;
+  max-width: 50rem; }
+  @media (max-width: 56.25em) {
+    .functionalities__text {
+      padding: 3rem 5rem 0 5rem; } }
+
+.functionalities__conclusion {
+  max-width: 60rem;
+  padding: 2rem 5rem 5rem 5rem; }
+
+.functionalities__strong {
+  font-weight: 400;
+  font-weight: bold; }
+
+.functionalities__video {
+  display: block;
+  margin: 2rem auto;
+  width: 326px;
+  height: 260px; }
+  .functionalities__video:focus {
+    border: none;
+    outline: none; }
+  @media (max-width: 56.25em) {
+    .functionalities__video {
+      width: 100%;
+      max-width: 326px;
+      height: 60%; } }
+
 .footer {
   text-align: center;
   background-color: #141414;
+  background-color: #141414;
   color: white;
   height: 18rem;
   padding-top: 4em; }

diff --git a/docs/assets/sass/abstracts/_variables.scss b/docs/assets/sass/abstracts/_variables.scss
@@ -25,4 +25,8 @@ $default-font-size: 1.6rem;
 $grid-width: 114rem;
 $gutter-vertical: 1rem;
 $gutter-vertical-small: 1rem;
-$gutter-horizontal: 1rem;
+$gutter-horizontal: 1rem;
+
+
+//COLOR 
+$dark-background: rgb(20, 20, 20);
diff --git a/docs/assets/sass/layout/_footer.scss b/docs/assets/sass/layout/_footer.scss
@@ -1,6 +1,7 @@
 .footer {
     text-align: center;
     background-color: rgb(20, 20, 20);
+    background-color: $dark-background;
     color: white;
     height: 18rem;
     padding-top: 4em;