Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test/demo app #477

Merged
merged 4 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
[![npm version](https://badge.fury.io/js/ember-infinity.svg)](http://badge.fury.io/js/ember-infinity)
[![Ember Observer Score](http://emberobserver.com/badges/ember-infinity.svg)](http://emberobserver.com/addons/ember-infinity)

[![Dependency Status](https://david-dm.org/ember-infinity/ember-infinity.svg)](https://david-dm.org/ember-infinity/ember-infinity)
[![devDependency Status](https://david-dm.org/ember-infinity/ember-infinity/dev-status.svg)](https://david-dm.org/ember-infinity/ember-infinity#info=devDependencies)

Demo: [ember-infinity.github.io/ember-infinity/](https://ember-infinity.github.io/ember-infinity/)
Demo: [ember-adopted-addons.github.io/ember-infinity/](https://ember-adopted-addons.github.io/ember-infinity/)

Simple, flexible infinite scrolling for Ember CLI Apps. Works out of the box
with the [Kaminari Gem](https://github.com/amatsuda/kaminari.git).
Expand Down Expand Up @@ -44,7 +41,7 @@ We test against `ember-source >= 3.28`. Try out `v2.0.0`. If it doesn't work or

2. **infinity-loader component**

3. **Route Mixin** (deprecated and removed as of 1.1). If you still want to upgrade, but keep your Route mixins, install `1.0.2`. See old docs (here)[https://github.com/ember-infinity/ember-infinity/blob/2e0cb02e5845a97cad8783893cd7f4ddcf5dc5a7/README.md]
3. **Route Mixin** (deprecated and removed as of 1.1). If you still want to upgrade, but keep your Route mixins, install `1.0.2`. See old docs (here)[https://github.com/ember-adopted-addons/ember-infinity/blob/2e0cb02e5845a97cad8783893cd7f4ddcf5dc5a7/README.md]

### Service Component Approach

Expand Down
187 changes: 11 additions & 176 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions test-app/app/styles/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ body {
right: 0;
}

.github-fork-ribbon::before {
background-color: purple;
}

.jumbo-header {
color: #fff;
background: purple;
Expand Down
9 changes: 1 addition & 8 deletions test-app/app/templates/demo-horizontal.hbs
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
<div class="demo-horizontal-view">
<div class="fixed-to-top jumbo-header text-center">
<a href="https://github.com/hhff/ember-infinity">
<img
style="position: absolute; top: 0; right: 0; border: 0;"
src="https://camo.githubusercontent.com/52760788cde945287fbb584134c4cbc2bc36f904/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f77686974655f6666666666662e706e67"
alt="Fork me on GitHub"
data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png"
/>
</a>
<a class="github-fork-ribbon" data-ribbon="Fork me on GitHub" href="https://github.com/adopted-ember-addons/ember-infinity" target="_blank" rel="noopener noreferrer">Fork me on GitHub</a>
<h2 id="title">ember-infinity</h2>
</div>

Expand Down
9 changes: 1 addition & 8 deletions test-app/app/templates/demo-scrollable.hbs
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
<div class="demo-view">
<div class="fixed-to-top jumbo-header text-center">
<a href="https://github.com/hhff/ember-infinity">
<img
style="position: absolute; top: 0; right: 0; border: 0;"
src="https://camo.githubusercontent.com/52760788cde945287fbb584134c4cbc2bc36f904/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f77686974655f6666666666662e706e67"
alt="Fork me on GitHub"
data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png"
/>
</a>
<a class="github-fork-ribbon" data-ribbon="Fork me on GitHub" href="https://github.com/adopted-ember-addons/ember-infinity" target="_blank" rel="noopener noreferrer">Fork me on GitHub</a>
<h2 id="title">ember-infinity</h2>
</div>
<ul id="demo-items-scrollable" class="demo-items">
Expand Down
9 changes: 1 addition & 8 deletions test-app/app/templates/demo.hbs
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
<div class="demo-view">
<div class="fixed-to-top jumbo-header text-center">
<a href="https://github.com/hhff/ember-infinity">
<img
style="position: absolute; top: 0; right: 0; border: 0;"
src="https://camo.githubusercontent.com/52760788cde945287fbb584134c4cbc2bc36f904/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f77686974655f6666666666662e706e67"
alt="Fork me on GitHub"
data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png"
/>
</a>
<a class="github-fork-ribbon" data-ribbon="Fork me on GitHub" href="https://github.com/adopted-ember-addons/ember-infinity" target="_blank" rel="noopener noreferrer">Fork me on GitHub</a>
<h2 id="title">ember-infinity</h2>
</div>

Expand Down
3 changes: 3 additions & 0 deletions test-app/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ module.exports = function (defaults) {
behave. You most likely want to be modifying `./index.js` or app's build file
*/

// Import the CSS file
app.import('node_modules/github-fork-ribbon-css/gh-fork-ribbon.css');

const { maybeEmbroider } = require('@embroider/test-setup');
return maybeEmbroider(app);
};
1 change: 1 addition & 0 deletions test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"github-fork-ribbon-css": "^0.2.3",
"loader.js": "^4.7.0",
"miragejs": "^0.1.48",
"pretender": "^3.4.7",
Expand Down