Skip to content

Commit

Permalink
Update ember package
Browse files Browse the repository at this point in the history
  • Loading branch information
shijiezhou1 committed Apr 10, 2020
1 parent 13a59d4 commit 64c785c
Show file tree
Hide file tree
Showing 8 changed files with 11,339 additions and 20,323 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

.DS_Store*
package-lock.json
24 changes: 21 additions & 3 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@
width: 600px;
cursor: zoom-in;
}
pre {
white-space: pre-wrap;
word-wrap: break-word;
code {
font-size: 12px;
}
}
}

.flex-container {
Expand Down Expand Up @@ -104,6 +111,11 @@
}
}

.pdfSetting {
width: 60%;
height: 100vh;
}

@media only screen and (max-width: 414px) {
.application_nav {
max-width: 414px;
Expand Down Expand Up @@ -134,9 +146,11 @@
font-size: 0.7em;
padding: 6% 10px;
overflow-wrap: normal;
}
code {
font-size: 12px;
white-space: pre-wrap;
word-wrap: break-word;
code {
font-size: 12px;
}
}
}
.postCardStyle {
Expand All @@ -159,6 +173,10 @@
.application_float_card_right {
display: none;
}
.pdfSetting {
width: 60%;
height: 100vh;
}
}

@import "ember-content-placeholders";
16 changes: 15 additions & 1 deletion app/templates/heated.hbs
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
{{outlet}}
<div class="postContentStyle">
<h3>Introduction:</h3>

<b>Living life openly. This year I set the following goals. Below you can find
the progress on each.</b>

<br>Software Engineer at MMSG
<br>location
<br>Salt Lake City
<br>education
<br>University of California, San Diego | B.A.
<br>joined
<br>Mar 21, 2019

</div>
16 changes: 1 addition & 15 deletions app/templates/self.hbs
Original file line number Diff line number Diff line change
@@ -1,15 +1 @@
<div class="postContentStyle">
<h3>Introduction:</h3>

<b>Living life openly. This year I set the following goals. Below you can find
the progress on each.</b>

<br>Software Engineer at MMSG
<br>location
<br>Salt Lake City
<br>education
<br>University of California, San Diego | B.A.
<br>joined
<br>Mar 21, 2019

</div>
<iframe class="pdfSetting" src="/assets/resume.pdf" frameborder="0"></iframe>
44 changes: 24 additions & 20 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,54 +1,58 @@
'use strict';
"use strict"

module.exports = function(environment) {
let ENV = {
modulePrefix: 'ember-blog',
modulePrefix: "ember-blog",
environment,
rootURL: '/',
locationType: 'auto',
rootURL: "/",
locationType: "auto",
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false
}
Date: false,
},
},

APP: {
// Here you can pass flags/options to your application instance
// when it is created
}
};
},
}
//TURN OFF MIRAGE WHEN SERVER IS ON
ENV['ember-cli-mirage'] = { enabled: true, autostart: true };
ENV["ember-cli-mirage"] = { enabled: true, autostart: true }
ENV.contentSecurityPolicy = {
// ... other stuff here
"connect-src": "'self' http://localhost:4200",
}

if (environment === 'development') {
if (environment === "development") {
// ENV.APP.LOG_RESOLVER = true;
// ENV.APP.LOG_ACTIVE_GENERATION = true;
// ENV.APP.LOG_TRANSITIONS = true;
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
// ENV.APP.LOG_VIEW_LOOKUPS = true;
}

if (environment === 'test') {
if (environment === "test") {
// Testem prefers this...
ENV.locationType = 'none';
ENV.locationType = "none"

// keep test console output quieter
ENV.APP.LOG_ACTIVE_GENERATION = false;
ENV.APP.LOG_VIEW_LOOKUPS = false;
ENV.APP.LOG_ACTIVE_GENERATION = false
ENV.APP.LOG_VIEW_LOOKUPS = false

ENV.APP.rootElement = '#ember-testing';
ENV.APP.autoboot = false;
ENV.APP.rootElement = "#ember-testing"
ENV.APP.autoboot = false
}

if (environment === 'production') {
if (environment === "production") {
// here you can enable a production-specific feature
ENV.rootURL = '/Ember-Blog/';
ENV.rootURL = "/Ember-Blog/"
}

return ENV;
};
return ENV
}
Loading

0 comments on commit 64c785c

Please sign in to comment.